revert some previous changes to test if helps with blocks