controls are correct now I think