Slight performance improvement but still slow