Fixing broken skim
Adding duplicate check