Some more changes for collision logic