Updated to work with Trusty, removed plain machine.