| update: refactor the code.
| update: try to fixed the display issu.e