updated todo and examples