commiting for merge
merging
minor changes