adds better settings management