Refactor. Use eea.frame 0.4.1