even better collision

sometimes moving code around makes things work better! :D