new style and slight tweaks