Class 20 rewire

Class 20 rewire