Updated collision detector