narayanan: merging forgot pswd and my changes