integrated final changes