refactored how saved status is handled