Updated with latest mods