Updated to new collision