add TODO and a little delete