Repository adjusted. Functional Programming stuff, added