moving back to master for electrical noise tests