added some text
merged the changes