added support for multi-blocks