Modifying to fit new style