New machne logic done