diff --git a/beautiful-racket/br/demo/stacker copy.rkt b/beautiful-racket/br/demo/stacker copy.rkt
deleted file mode 100644
index 61ae415..0000000
--- a/beautiful-racket/br/demo/stacker copy.rkt	
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang br/quicklang
-
-(define (read-syntax src-path in-port)
-  (define args (port->list read in-port))
-  (define module-datum `(module stacker-mod br/demo/stacker
-                          ,@args))
-  (datum->syntax #f module-datum))
-(provide read-syntax)
-
-(define-macro (stacker-module-begin ARG ...)
-  #'(#%module-begin
-     (push ARG) ...
-     (display (first stack))))
-(provide (rename-out [stacker-module-begin #%module-begin]))
-
-(define stack empty)
-
-(define (pop-stack!)
-  (define first-item (first stack))
-  (set! stack (rest stack))
-  first-item)
-
-(define (push-stack! elem) (set! stack (cons elem stack)))
-
-(define (push arg)
-  (cond
-    [(number? arg) (push-stack! arg)]
-    [else
-     (define op-result (arg (pop-stack!) (pop-stack!))) 
-     (push-stack! op-result)]))
-
-(provide + *)
-
-(module+ test 
-  (require rackunit)
-  (check-equal? (with-output-to-string (λ () (dynamic-require "stacker-test.rkt" #f))) "36"))
\ No newline at end of file
diff --git a/beautiful-racket/br/demo/stacker.rkt b/beautiful-racket/br/demo/stacker.rkt
index fb67913..8afc511 100644
--- a/beautiful-racket/br/demo/stacker.rkt
+++ b/beautiful-racket/br/demo/stacker.rkt
@@ -1,27 +1,34 @@
 #lang br/quicklang
 
-(define (stacker-read-syntax src-path in-port)
-  (define args (port->list read in-port))
-  (with-pattern ([(ARG ...) args])
-    (strip-identifier-bindings
-     #'(module stacker-mod br/demo/stacker
-         ARG ...))))
+(define (read-syntax src-path in-port)
+  (define arg-datums (port->list read in-port))
+  (define module-datum `(module mod-name br/demo/stacker
+                          ,@arg-datums))
+  (datum->syntax #f module-datum))
 (provide read-syntax)
 
-(define-macro (stacker-module-begin ARG ...)
+(define-macro (stacker-module-begin ARG-STX ...)
   #'(#%module-begin
-     (push ARG) ...
-     (display (first stack))))
+     (put ARG-STX) ...
+     (display (pop-stack!))))
 (provide (rename-out [stacker-module-begin #%module-begin]))
 
 (define stack empty)
 
-(define (push arg)
+(define (pop-stack!)
+  (define item (first stack))
+  (set! stack (rest stack))
+  item)
+
+(define (push-stack! item)
+  (set! stack (cons item stack)))
+
+(define (put arg)
   (cond
-    [(number? arg) (set! stack (cons arg stack))]
+    [(number? arg) (push-stack! arg)]
     [else
-     (define op-result (arg (first stack) (second stack)))
-     (set! stack (cons op-result (drop stack 2)))]))
+     (define op-result (arg (pop-stack!) (pop-stack!))) 
+     (push-stack! op-result)]))
 
 (provide + *)
 
diff --git a/beautiful-racket/br/demo/stacker1-test.rkt b/beautiful-racket/br/demo/stacker1-test.rkt
deleted file mode 100644
index f5af26a..0000000
--- a/beautiful-racket/br/demo/stacker1-test.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang reader br/demo/stacker1
-4
-8
-+
-3
-*
\ No newline at end of file
diff --git a/beautiful-racket/br/demo/stacker1.rkt b/beautiful-racket/br/demo/stacker1.rkt
deleted file mode 100644
index 90ad172..0000000
--- a/beautiful-racket/br/demo/stacker1.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang br/quicklang
-
-(define (read-syntax src-path in-port)
-  (define args (port->list read in-port))
-  (define module-datum `(module stacker-mod br/demo/stacker1
-                          ,@args))
-  (datum->syntax #f module-datum))
-(provide read-syntax)
-
-(define-macro (stacker-module-begin ARG ...)
-  #'(#%module-begin
-     (push ARG) ...
-     (display (first stack))))
-(provide (rename-out [stacker-module-begin #%module-begin]))
-
-(define stack empty)
-
-(define (pop-stack!)
-  (define item (first stack))
-  (set! stack (rest stack))
-  item)
-
-(define (push-stack! item) (set! stack (cons item stack)))
-
-(define (push arg)
-  (cond
-    [(number? arg) (push-stack! arg)]
-    [else
-     (define op-result (arg (pop-stack!) (pop-stack!))) 
-     (push-stack! op-result)]))
-
-(provide + *)
-
-(module+ test 
-  (require rackunit)
-  (check-equal? (with-output-to-string (λ () (dynamic-require "stacker1-test.rkt" #f))) "36"))
\ No newline at end of file