Better typed (4/27)

Better typed