Updating with most recent optimized Jones model (v35) which includes both energy and capital stock.