Added super-primitve collision detection