Updated with latest styles