Better typed (6/27)

Better typed