New attempt to speed up everything...