merged from version in ZOO