Did settings (5/26)

Did settings