with some changes for new eagle