Added last minute changes