Much better now (17/18)

Much better now