Updated 2 mods by wuppy