update comments as well, please.