Did settings (25/26)

Did settings