Update
Add better settings