removed caching, tweaked model