changed serialization procedures and added rest of ms2