TODO comment moved