final changes before check-in