Update some code.
Add some comment