Updated TODO line numbers for reference