fixed contolls to be compatible with the new api