Reworked the Machines Specification