latest templates, but still need adjustments