final changes for approval on TEST