implementing changes from modification document.