Merge modifications from branch electrical_mw2

Merging the modifications done by Michael on the electrical branch