Updated short-form template