Updated to meet new eagle API