Fixing the 'template'