Electrified/Refactor