add some statement and bug fixed