Tweaks according to Rao's feedback.