added 17-20
updated 31