Add local variable declarations of temp results - take 2