Slight changes to mod structure