removed caching, refactored to multiy sensor