Cleanup code for the day, Upgrade collide works