Slightly improved performance