Refactored from traale to etb