Second attempt at motion tracking