v2.1 Fixed Count Issue, updated output with def