reorganized some things