Rolled back control.vhd to avoid hand ups. Tag V01-06