refactored the facades a bit