updated according to the official settings