Medea fix/tweak
More Zigor and saving