Updated with new styles