Changes proposed by David Tao implemented