diff --git a/fcore/app-update.sml b/fcore/app-update.sml
index 08e2cbb..4dae542 100644
--- a/fcore/app-update.sml
+++ b/fcore/app-update.sml
@@ -23,12 +23,13 @@ struct
     if count = 0 then
       let
         val {windowWidth, windowHeight, startLine, ...} = app
-        (* todo: get new startLine if cursor has moved out of screen *)
-        val startLine = TextWindow.getStartLine
-          (buffer, startLine, cursorIdx, windowWidth, windowHeight)
 
         (* move LineGap to first line displayed on screen, and build new text *)
         val buffer = LineGap.goToLine (startLine, buffer)
+
+        val startLine = TextWindow.getStartLine
+          (buffer, startLine, cursorIdx, windowWidth, windowHeight)
+
         val drawMsg = TextBuilder.build
           (startLine, cursorIdx, buffer, windowWidth, windowHeight)
 
@@ -60,6 +61,10 @@ struct
 
         (* move LineGap to first line displayed on screen, and build new text *)
         val buffer = LineGap.goToLine (startLine, buffer)
+
+        val startLine = TextWindow.getStartLine
+          (buffer, startLine, cursorIdx, windowWidth, windowHeight)
+
         val drawMsg = TextBuilder.build
           (startLine, cursorIdx, buffer, windowWidth, windowHeight)
 
diff --git a/fcore/text-window.sml b/fcore/text-window.sml
index 2bf6479..971c2bb 100644
--- a/fcore/text-window.sml
+++ b/fcore/text-window.sml
@@ -39,6 +39,68 @@ struct
             lineNum - 1
       end
 
+  fun getStartLineAfter 
+     ( sIdx, shd, lineNum, absIdx, cursorIdx, stl
+     , maxWidth, maxHeight, curWidth, curHeight
+     , origLine
+     ) =
+      if sIdx = String.size shd then
+        case stl of
+          hd :: tl =>
+            getStartLineAfter 
+              ( 0, hd, lineNum, absIdx, cursorIdx, tl
+              , maxWidth, maxHeight, curWidth, curHeight
+              , origLine
+              )
+        | [] =>
+            origLine
+      else
+        if absIdx = cursorIdx then
+          origLine
+        else
+          let
+            val chr = String.sub (shd, sIdx)
+          in
+            if chr = #"\n" then
+              if curHeight + (ySpace * 3) >= maxHeight then
+                getStartLineAfter 
+                  ( sIdx + 1, shd, lineNum + 1, absIdx + 1, cursorIdx, stl
+                  , maxWidth, maxHeight, 0, 0
+                  , origLine + 1
+                  )
+              else
+                getStartLineAfter 
+                  ( sIdx + 1, shd, lineNum + 1, absIdx + 1, cursorIdx, stl
+                  , maxWidth, maxHeight, 0, curHeight + ySpace
+                  , origLine
+                  )
+            else 
+              if curWidth + xSpace <= maxWidth then
+                let
+                  val curWidth = curWidth + xSpace
+                in
+                  getStartLineAfter 
+                    ( sIdx + 1, shd, lineNum, absIdx + 1, cursorIdx, stl
+                    , maxWidth, maxHeight, curWidth, curHeight
+                    , origLine
+                    )
+                end
+              else
+                (* have to create visual line break *)
+                if curHeight + (ySpace * 3) >= maxHeight then
+                  getStartLineAfter
+                    ( sIdx + 1, shd, lineNum + 1, absIdx + 1, cursorIdx, stl
+                    , maxWidth, maxHeight, 0, 0
+                    , origLine + 1
+                    )
+                else
+                  getStartLineAfter
+                    ( sIdx + 1, shd, lineNum + 1, absIdx + 1, cursorIdx, stl
+                    , maxWidth, maxHeight, 0, 0
+                    , origLine
+                    )
+          end
+
   (* Prerequisite: LineGap is moved to oldLine first. *)
   fun getStartLine (lineGap: LineGap.t, oldLine, cursorIdx, maxWidth, maxHeight) =
     let
@@ -70,7 +132,12 @@ struct
                 (startIdx + 1, rStrHd, oldLine, absIdx + 1, cursorIdx, leftStrings)
             else if cursorIdx > absIdx then
               (* possibly move downwards *)
-              oldLine
+              let val _ = print "start 133\n" in
+              getStartLineAfter 
+                 ( startIdx, rStrHd, oldLine, absIdx, cursorIdx, rStrTl
+                 , maxWidth, maxHeight, 0, 0
+                 , oldLine
+                 ) end
             else
               (* keep current line *)
               Int.max (oldLine - 1, 0)
diff --git a/shf b/shf
index acd24c3..0519cc8 100755
Binary files a/shf and b/shf differ