Better typed (11/27)

Better typed