code revision and enhancement
code revision and enhancement