First batch of mods, i tried :P