Took out timeout check because it was messing things up