Improving save of device