merging changes

nice commits