Made movement more robust