Adding last minute changes added by apennell