Added ch 16 soutions