Making changes per comments