changed db schema
merged