refactor gbook and partner