some renaming
one more if to catch the pesky squre in the temp field