modified comment and util.c