Removed hardcoded timeout