Better typed (3/27)

Better typed