achanged many classes to only use machine Ids