18_02/ 1- some change
18_02/ 2 - remove 1 bugs