Major G-Template Fix