fixed collisions, works now