Added Save on Main Thread