Update after jerome relecture