Not sure how we lost some of this data in the last commit