Template application working better