performance tweek, more data
Merge branch 'master' of https://github.com/avid221/CoolestStory