Dk

Modifications to get controllers in line.