Eagle complete with some refactoring