Much better now (16/18)

Much better now