Vlad's Fix

This should now, it uses classes  instead of indexes to select the
elements to highlight