Including Prashant's suggestions