Added counting around partition states