Not taking lastTimeDetectedInto account between locks
Removed unused return