changed by Naveen