1.6 done an 1.7 little modifications
1.6 dona and 1.7 little modifications