fixed schema
merged