+ Added one additional data set
* Small optimizations and comments added