Commit 5 - More collision checks