incrementally better photo handling