17 and 22 updated