[DEV] Cleaned up collisions