Updated for all simulations and data analysis