slowly getting the new schema to work