Reorganized variables