match machine names as Anuj put in appendix; some section re-org to mention things Anuj described