Updated collision logic