Refactor v2.1.1.3