Adjustment

Adjustment of functions
Implementation of Caching