a lot of correction based on Vaishnavi comments