updates to closure templates