Esopus upstream 5-23-21