Better typed (24/27)

Better typed