Moved timeout and made faster