Revised TODO Manager