do we really need this block? can we remove it to avoid confusion?