taking over jewel

Change-Id: I137bfe6b21c2a4e13d5e095d571f7078361c4921