Changes to get rid of figure csv