adding spans for easier parsing