I was trying to optimize this w/o using this, hope the change is right.