converted to new style