Added templae stuff