elec refactoring done
cone is work in progress