Added id plus some testing mods