problem 22 & 23 added