TODO -lists updated