Ribbons V2

Change-Id: I333b5211fed89e5f389573907f018cc131564f33