merged Jeff's template