Added a setting logic