Did settings (6/26)

Did settings