Some more experiments...

Change-Id: I02341603d13b163ac002591c7922160676bae268