Huge performance improvement
deleted the demo files
Merged master