Make this better (18/21)

Make this better