regenerated using updated templates