add and remove photo handling improved 2.0