We do need to link these too