Merging changes

etc