camera mode implemented
mergedchanges
mergedchanges