Updated BB Added templates with/without funding