Addressed review comments except for tidal order switches