final todos added