[Stable] Refactored version ok.