Numberlink improvements