working on fixing collisions