Modify template to be more pippy