fixed collision to work with all movements