clean up
2 new parameters for 2 new machines