reorganized things more