Switched to non-modified EB tools