More edits to #count