Sightly refactor pt 5 - re-added missing content