build 0007

code optimization