Pre-final changes