Changed definitions and control.