Refactored stock sensors to 6 sensors