rework save call