Fixing up the machine