WIP: complete changes to ex4

Change-Id: Iece8807e969a6bfc28558ce7187b7fbc0c5764b4