Change machine feature to run first