Changes made from comments