adapted to huge walaFacade refactoring step