Changes suggested by Nishchal