Moved some misplaced code.