add problems 17 and 22