removed last reference to 'machine_name'