added pond info
merge conflicts resolved