Made some last minute changes