Improve sidestepping