diff --git a/collects/stepper/private/annotate.rkt b/collects/stepper/private/annotate.rkt
index f6889707c5..51e11ff60d 100644
--- a/collects/stepper/private/annotate.rkt
+++ b/collects/stepper/private/annotate.rkt
@@ -1176,7 +1176,7 @@
   (define/contract annotate/top-level
     (syntax? . -> . syntax?)
     (lambda (exp)
-      (syntax-case exp (module #%plain-module-begin let-values dynamic-wind #%plain-lambda #%plain-app)
+      (syntax-case exp (module #%plain-module-begin let-values dynamic-wind #%plain-lambda #%plain-app define-values)
         [(module name lang
            (#%plain-module-begin . bodies))
          #`(module name lang (#%plain-module-begin #,@(map annotate/module-top-level (syntax->list #`bodies))))]
@@ -1189,10 +1189,10 @@
                         (#%plain-lambda () . rest2)
                         (#%plain-lambda () . rest3)))
          exp]
-        ; STC: for lazy
-        [(#%plain-app . terms) (annotate/module-top-level exp)]
         ; STC: for lazy, handle defines
         [(define-values (ids ...) bodies) (annotate/module-top-level exp)]
+        ; STC: for lazy
+        [(#%plain-app . terms) (annotate/module-top-level exp)]
         [else
          (error `annotate/top-level "unexpected top-level expression: ~a\n"
                 (syntax->datum exp))
diff --git a/collects/stepper/private/lazy-highlighting.rkt b/collects/stepper/private/lazy-highlighting.rkt
index 3041355f29..a5273397ec 100644
--- a/collects/stepper/private/lazy-highlighting.rkt
+++ b/collects/stepper/private/lazy-highlighting.rkt
@@ -7,7 +7,8 @@
 (define 
   table 
   (make-immutable-hasheq
-   '((caar   . 1)
+   '((take   . 0)
+     (caar   . 1)
      (cadr   . 0)
      (cdar   . 1)
      (cddr   . 0)
diff --git a/collects/stepper/private/reconstruct.rkt b/collects/stepper/private/reconstruct.rkt
index a8db72ce4f..3681e362ff 100644
--- a/collects/stepper/private/reconstruct.rkt
+++ b/collects/stepper/private/reconstruct.rkt
@@ -850,12 +850,12 @@
                                                 (case (mark-label (car mark-list))
                                                   ((not-yet-called)
                                                    (if (null? unevaluated)
-                                                       #`(#%plain-app . #,rectified-evaluated)
-                                                       #`(#%plain-app 
-                                                          #,@rectified-evaluated
-                                                          #,so-far 
-                                                          #,@(map recon-source-current-marks (cdr (map car unevaluated))))))
-                                                  ((called)
+                                                        #`(#%plain-app . #,rectified-evaluated)
+                                                        #`(#%plain-app 
+                                                           #,@rectified-evaluated
+                                                           #,so-far 
+                                                           #,@(map recon-source-current-marks (cdr (map car unevaluated))))))
+                                                  ((called) ; unevaluated = null
                                                    (stepper-syntax-property
                                                     (if (eq? so-far nothing-so-far)
                                                         (datum->syntax #'here `(,#'#%plain-app ...)) ; in unannotated code ... can this occur?
@@ -870,6 +870,7 @@
                                                                     cdadar cdaddr cddaar cddadr cdddar cddddr 
                                                                     second third fourth fifth sixth seventh eighth))
                                                                  #`(#%plain-app #,(datum->syntax #'here obj-name) #,so-far)]
+                                                                [(eq? obj-name 'take) #`(#%plain-app . #,rectified-evaluated)]
                                                                 [else
                                                                  (datum->syntax #'here `(,#'#%plain-app ... ,so-far ...))])))
                                                     'stepper-args-of-call 
diff --git a/collects/tests/stepper/automatic-tests.rkt b/collects/tests/stepper/automatic-tests.rkt
index ad3629c437..ff92199015 100644
--- a/collects/tests/stepper/automatic-tests.rkt
+++ b/collects/tests/stepper/automatic-tests.rkt
@@ -12,7 +12,8 @@
     lazy-caaadr lazy-caadar lazy-caaddr lazy-cadaar lazy-cadadr lazy-caddar
     lazy-cadddr lazy-cdaaar lazy-cdaadr lazy-cdadar lazy-cdaddr lazy-cddaar
     lazy-cddadr lazy-cdddar lazy-cddddr lazy-second lazy-third lazy-fourth
-    lazy-fifth lazy-sixth lazy-seventh lazy-eighth))
+    lazy-fifth lazy-sixth lazy-seventh lazy-eighth
+    lazy-if1 lazy-if2 lazy-take-0 lazy-take))
 
 (let ((outer-namespace (current-namespace)))
   (parameterize ([display-only-errors #t]
diff --git a/collects/tests/stepper/through-tests.rkt b/collects/tests/stepper/through-tests.rkt
index 3e20b47f69..53db91c106 100755
--- a/collects/tests/stepper/through-tests.rkt
+++ b/collects/tests/stepper/through-tests.rkt
@@ -1709,7 +1709,55 @@
         -> ,def (+ 3 {,subarg3}) -> ,def (+ 3 {7})
         :: ,def {(+ 3 7)} -> ,def {10}))
    
+   ; lazy-if1
+   ; (define (f x) (if x (/ 1 0) (not x)))
+   ; (f (< 1 0))
+   (let* ([make-body (λ (x) `(if ,x ,err (not ,x)))]
+          [body (make-body 'x)]
+          [def `(define (f x) ,body)]
+          [lam `(lambda (x) ,body)]
+          [arg '(< 1 0)]
+          [body-subst (make-body arg)])
+     (t 'lazy-if1 m:lazy
+        ,def (f ,arg)
+        :: ,def ({f} ,arg) -> ,def ({,lam} ,arg)
+        :: ,def {(,lam ,arg)} -> ,def {,body-subst}
+        :: ,def (if {,arg} ,err (not {,arg})) -> ,def (if {false} ,err (not {false}))
+        :: ,def {(if false ,err (not false))} -> ,def {(not false)} -> ,def {true}))
+   
+   ; lazy-if2
+   ; (define (f x) (if x (not x) (/ 1 0)))
+   ; (f (> 1 0))
+   (let* ([make-body (λ (x) `(if ,x (not ,x) ,err))]
+          [body (make-body 'x)]
+          [def `(define (f x) ,body)]
+          [lam `(lambda (x) ,body)]
+          [arg '(> 1 0)]
+          [body-subst (make-body arg)])
+     (t 'lazy-if2 m:lazy
+        ,def (f ,arg)
+        :: ,def ({f} ,arg) -> ,def ({,lam} ,arg)
+        :: ,def {(,lam ,arg)} -> ,def {,body-subst}
+        :: ,def (if {,arg} (not {,arg}) ,err) -> ,def (if {true} (not {true}) ,err)
+        :: ,def {(if true (not true) ,err)} -> ,def {(not true)} -> ,def {false}))
 
+   ; lazy-take-0
+   (let ([e '(take 0 (list 1 2))])
+     (t 'lazy-take-0 m:lazy
+        ,e :: {,e} -> {empty}))
+   
+   ; lazy-take
+   ; FIXME: when unknown promises implemented
+   (t 'lazy-take m:lazy
+      (take (+ 0 2) (list (+ 1 2) (+ 3 4) (/ 1 0)))
+      :: (take {(+ 0 2)} (list (+ 1 2) (+ 3 4) (/ 1 0)))
+      -> (take {2} (list (+ 1 2) (+ 3 4) (/ 1 0)))
+      :: {(take 2 (list (+ 1 2) (+ 3 4) (/ 1 0)))}
+      -> {(cons (+ 1 2) promise)})
+
+      
+      
+      
   #;
   (t1 'teachpack-callbacks
      (test-teachpack-sequence