updated schema
merged