worked until remove_block