rearranged todos
period