Refactor v2.2.3.1