Add the sweetness

Change-Id: I29470f4536470bb4075bc718a7bb69976c0f88f1