Removed timeout for testing. It might not be functioning correctly