Update in preparation for some collision detection