Updated for Ed's new sensor