Changed movement handling