updates based on Sameer's feedback