more serilization changes