Switched to passing pointers to blocks