modified caching
removed old unsused temp
prep for rowwise processing