Another pass over photo manager