integrated changes, writing kb
merged