merged master and oldschema