Slight changes for up coming additions