Moved interface update out of loop