near final changes