Changed machine behavoir to reflect new system