Kristof's addons

Change-Id: Ife4e7b253882bb6cf396e4877f158ed18b142e90