new changes from tabaga