Updated for multiple movements