Added week 18 code