finished final changes