cooperve changes

Change-Id: I3c31445fd5e1bee51e044825ecc835292d87d8d7