refactored into partials