Added some more code including start of a timeout