updated with scripts and template