Added day16 and 17