dev: adaptation to blocks