some changes for the last commits

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