Function fixes in gen_control, who the **** deleted those optional functions?!