Better increment tracking and not use promises