move move_track to new func