changed stuff, now working on new machine