further tweaks from Radhika