Better typed (16/27)

Better typed