Collision fixes
Project v1