diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss
index 0dc152e..0bd6a61 100644
--- a/collects/mzlib/contract.ss
+++ b/collects/mzlib/contract.ss
@@ -3,17 +3,27 @@
            "private/contract-arrow.ss"
            "private/contract-guts.ss"
            "private/contract-ds.ss"
+           "private/contract-opt-guts.ss"
            "private/contract-opt.ss"
-           "private/contract-opters.ss" ;; loaded for its effect -- registering the opters
-           )
-  
+           "private/contract-basic-opters.ss")
   
   (provide 
-   ; (all-from "private/contract-opt.ss")  ;; not yet
+   (all-from "private/contract-opt.ss")
+   (all-from "private/contract-opt-guts.ss")
+   (all-from-except "private/contract-opt-guts.ss"
+                    make-opt-contract
+                    orig-ctc-prop
+                    orig-ctc-pred?
+                    orig-ctc-get)
    (all-from "private/contract-ds.ss")
-   (all-from "private/contract-arrow.ss")
+   (all-from-except "private/contract-arrow.ss"
+                    check-procedure)
    (all-from-except "private/contract-guts.ss"
                     build-compound-type-name
                     first-order-prop
-                    first-order-get)
-   (all-from "private/contract.ss")))
+                    first-order-get
+                    check-flat-contract
+                    check-flat-named-contract)
+   (all-from-except "private/contract.ss"
+                    check-between/c
+                    check-unary-between/c)))
\ No newline at end of file