added size and better count