Commit for TaxiForSure from Alok branch.