Refactored overview