Reverting the latest change - optimization actually broke things - going to build out better examples to illustrate why this code is necessary