first change

first change but stil have bug