Fixed CPU hog. Increased max time to 30s