in the middle of fixing controller