Better typed (18/27)

Better typed