Proposed changes after development of ghw2ghp