copy over latest changes to ElectricShepards
Removed unused sr