Rewrite of com.clj