Do we still need this block?