Modified TODO to reflect updates.