Reinstated counts as they're needed for availability check, but code still needs fixing!