Some changes to manual template