Reorganized loop code and added a bunch of data