changes suggested by Mukund bhai