Controller I hope is fixed

PULL ATTEMPT