Update wrt comments from review