update comments accordingly