Updated program explorer and machado