Modified for new markup / using counter