added additional sensors, not at all DRY