I think this block should be moved left 4 spaces. Having it under the if on line 213 means the new tag won't be written unless there was an old value, right? I guess I'm not 100% certain what happens if there isn't a Name tag to begin with.