added up to exer1_17