Adjusted the TODO