final changes from KP