Changes made from review