added todo and made some changes