Ivan, final changes