restructured todo