Implementing T1902
Refactoring of T1902