Updated to new style