Finished with all new simulation figures