Refactoring of Tapi Step2