Some code was reorganized