Less caching
Easier debuging and bug fixes