Started implementing replacement for dripdetection