Collision Fix

-More comments are needed