revert to ejs
more changes