Added control section, looks like hell