WIP:changes for CWR

	note:this is still a work in progress

Change-Id: Ic397c7228396b32dd06d7bcc6ea243ff5ac8a638