Better typed (25/27)

Better typed