Add changes suggested by Ray and Tammy