Updated style, etc