Do we also still need the warning block as well?