Adding % counter
Production ready