Added in final-nail mods