more work on machine manager