Added motion control