Moved timeout into reset wrapper