problems 17-23 added