More discoverable version