Improvements on DPS Counters (test needed)