new version with ejs