solved 21 & 22
update