Updated style.. Somewhat