Added more collision checking