New sources from EAP 6.1.1