Changed made from comments updated