Added some form of timeout