Addresses comments