Changes from prateek's review