Better typed (22/27)

Better typed