Make control more versatile