Added collision detection(no resolution yet)