modifies logic for rendering and saving