Corrected counter, added convenience method.