use generated data rather than a remote json file
Merge remote-tracking branch 'origin/master'
merge and clean up