sorry for all the pull requests! I fiddled a bit with my data collection...