Switched to more stable and easier collision logic