motified template with pull #13