Switch to Machine IDs