Updated with styles