Cleaned up collisions