18 & 19 updated