Added changes from Dave

Rev 21 file.