Some more stuff we'd need to add to the SAD