upgraded to CI v.2.1.3, improved sparks, a lot of refactoring