change over to WHO functionality