Add changes to get trackmotion (guroopro) working