refactored all the partials