UPDATE: Added new settings