more style2 changes