diff --git a/TODO b/TODO
index 4ee6331..dc7e449 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+save width in Textline, create new <div> in the middle
+
 add async to <script>
 link in outline: dest-detail vs hashtag
 
diff --git a/src/HTMLRenderer/state.cc b/src/HTMLRenderer/state.cc
index 5a0a491..7048897 100644
--- a/src/HTMLRenderer/state.cc
+++ b/src/HTMLRenderer/state.cc
@@ -380,7 +380,7 @@ void HTMLRenderer::check_state_change(GfxState * state)
             }
             //else no solution
         }
-        // else force new line
+        // else: different rotation: force new line
 
         if(merged)
         {
diff --git a/src/HTMLTextLine.cc b/src/HTMLTextLine.cc
index 29b5be1..4759e15 100644
--- a/src/HTMLTextLine.cc
+++ b/src/HTMLTextLine.cc
@@ -188,17 +188,28 @@ void HTMLTextLine::dump_text(ostream & out)
                     // finally, just dump it
                     if(!done)
                     {
-                        long long wid = all_manager.whitespace.install(target, &actual_offset);
-
-                        if(!equal(actual_offset, 0))
+                        if(param.optimize_text < 3) 
                         {
-                            if(is_positive(-actual_offset))
-                                last_text_pos_with_negative_offset = cur_text_idx;
+                            long long wid = all_manager.whitespace.install(target, &actual_offset);
 
+                            if(!equal(actual_offset, 0))
+                            {
+                                if(is_positive(-actual_offset))
+                                    last_text_pos_with_negative_offset = cur_text_idx;
+
+                                double threshold = state_iter1->em_size() * (param.space_threshold);
+
+                                out << "<span class=\"" << CSS::WHITESPACE_CN
+                                    << ' ' << CSS::WHITESPACE_CN << wid << "\">" << (target > (threshold - EPS) ? " " : "") << "</span>";
+                            }
+                        }
+                        else 
+                        {
+                            // aggressive optimization
                             double threshold = state_iter1->em_size() * (param.space_threshold);
-
-                            out << "<span class=\"" << CSS::WHITESPACE_CN
-                                << ' ' << CSS::WHITESPACE_CN << wid << "\">" << (target > (threshold - EPS) ? " " : "") << "</span>";
+                            if(target > threshold)
+                                out << ' ';
+                            actual_offset = target;
                         }
                     }
                 }