Integrated the two styles properly