started correcting as per feedback