[camera] worked on David's comments