Changed to time-based motion