change fix bug
final.....testings