Work without counter

Added changes for work without counter