added count, minor changes