refactoTapi2.4 Final touch