Some reworking of Control content