name added
fixing names
merging