added setting handling