[FIX] - Fixed TODO-7.0 and TODO-6.1 location.