added last minute changes