Changes as per suggestions