More changes to data structure and start reconstructing data from email click.