removed hardcoded timeout