Today
merge from sprinkler_vis_refactor