highlightly may be off by +1? fixed generic list issue.