added key-specific controls