Better typed (5/27)

Better typed