Revamped collision logic