even more changes to machine tags