fixed all the regressions