moved things into partials