Added two extra settings