Removed regex, added timeout.