changed swap to adequate to changes to load and dump.