Update to new style