re-added convenience functions lost after refactor