Update corresponding to owa's comments