Updated Duke605's mods