Added more fine-grained movement controls