Edit to Brad's Waisman post