Updated with getCount()