Incorporate all of Maha's suggestions