Agree the original was better, but this version is shorter --- do you you want me to roll this change back?