data model and photo change
fix merge conflicts
add photo back