Today
merge from camera_waterlevel_optimize