first draft at upgrading to eap6.1