REFACTOR: new doc locations with expansive
REFACTOR: new doc locations with expansive