Got rid of count