Moved some lines of code.