more todo and better description