[903] Template tweaking