Still working on Sensor issues