More to final changes