implemented better settings