Make the cntr stuff a little less insane.