(Added) - more template work