redoing minor ec stuff