keep -skip_folded and -saw_river functionalities separate