REFACTOR: to support expansive