did some more reordering for the cache