Add new content again
merge in modified lisp
Merge branch 'master' into new