added todo/bug part