Another speed up attempt