fix unconsious code
add TODO