generated with updated templates