slight changes for stuff