[#125] Practocally solve problem, need to polish code