Here is a simple Valkyrie change that I think would solve some folks problems yet keep happy the folks who already are happy with her