Update wrt comments