make some progress for the last commit

Signed-off-by: RayAllen <ray@ray-Lenovo-IdeaPad-S400.(none)>