Update after Jans comments