Include board ID calculations only when necessary