You remove the comment about the origin of state-machine and the collision warning. Is that intentional ?