rearranged TODO some