Ribbons V2

Change-Id: I9c9687cab1b5685b2859ed09228bae132b3500e8