Updates as per suggestions