migrated to dominator 3.x, some fixes