updated to use cljx