Individual EC now works! :) (without tests)