Changed the way timeout works for sensors