Added basic block collision detection