Added the safety timeout feature