Add sammies changes after approval from legal
Sprinkle more ts() around