Merging in final changes