Edit #2 from VS
Accepted merge.