Added better count (NOT TESTED)