modifications by Rajesh