Made some performance optimizations
Merge branch 'master' of https://github.com/ruudvanderweijde/EvolutionAdvancedTrack