Refactored overview as in #18