Helping Jeroen to get things sorted

Thanks to Francis for pointing out the E2 differences.