Kelly's changes merging