Enhance save-room.