Changes to fit EEA needs.