Added settings, made main setting