added some more unserializing