Improve collisions

Signed-off-by: Toastation <toastations@gmail.com>