Update things

Change-Id: I56fd54e8e8654bd94612d4e4202e4960aca00731
Living on the edge (phoenix)

Change-Id: Id3b2a4c04ef5db5bb61670e48b8bec1fb83b4f45