Controller wire

Made changes for main pull request. @TygerBurning.