created branch
implemented better settings