Updated to work with LISP