Merging dannys changes