Updated for blocks