code refactoring: GW wrapper >