Changes made as commented.