Making changes as per Suresh request