add todo and improve an example