Pulling lars/olas changes to whoffrance