* Modifying date output
* Removing redundant source (we use matchit later on)