17 and 18 updated