made Facade more better