just trying to optimize a bit the handler for movement