Merging in some changes