Last changes from Dean Berris.