merge new style with latest ocupop
merge new style with latest ocupop