I'll need to automate this but this is the updated templates