Improved settings
Finished Task D