slight changes for linking