Patrick final changes