Added new settings logic