reorganized template includes #4