Better typed (12/27)

Better typed