Revert "Minor changes -> SAYT"

This reverts commit 5f12937d47f35471eca607df2caf11ea56b7e042.
Revert "Revert "Minor changes -> SAYT""

This reverts commit 398879847477a0a45d1cc9a8c0c78e1ceae44403.