Update from Manav suggestions