P - added missing photos
refactoring