updated to EAPI=5