changes by Abhay(major)