change to new style