Added timeout to 2 more methods
Made some other changes based on pratice run