Changes made from comments raised by Tina Tsou