updated figures and templates