Updated timeout. Not sure why I am stuck with a race condtion here!!