Forked template changes