Some changes to Photograph