return sensors to general case
starting from near scratch; needs rewrite