First commit of the collision component