updated to newest version of Machine