Renaming for clarity.
Got the third point data collection to work better.