Updated with new style code