working on new schema