My changes after merging (some comments changed)