Add captions, redo the output