Basic Templates Updated