Updated collision functions