issue 12 & template update