Added more states to settings