Merging in changes

Last minute changes