Incorporate @rangadi's feedback