ticket: 10 reorganized