Moved to use simple counter