refactored sensors