Move machineID back inside Create.
Re-order an if statement.