Type up (16/18)

Type up