Major update to new style