Now has sensor activation stuff in required places