redesigns facade; fixes #118