Updated to new collision system