Type1 simplyfied, Type2 added