Some more attempts to speed up