By Satnam old changes