Little modification in TODO