Add collision detection
Make explicit use of defaultReturnValue
Use explicitly the defaultReturnValue