merged from neo