Changes made from comments 11:04