Improvements over save/dicard