cannot filter out equity
Merge branch 'caphistory' into testing