Proper collision handling