Added partial collision functionality
Resolved conflict