updated with new style