reorganized some stuff