Separate sensor handling