Re-written to include :caption information