updated setup and template