Added attempted collision fixes