Incorporate Anant's suggestions