reorganized TODO