Updates as per further discussion