Corrected branches and template