new style, some fixes