fixed bug in if-clause, sets up without watershed (completed)