Added a partial to remove duplicate code