Initial changes for machine