final changes / integration