added todo's abruptedly.