Make collisions work better