pat: final changes