changes from Geoff Collyer "to work on machines with stricter alignment