Last minute changes

Last minute changes