Adds b/strong handling