made collecting optional
still experimenting with weird caching issue