Finally getting the timeout (final feature for release)