#10 upgrades on app template