Agreed overall better, a little more logic would be needed for dup detection. Moot as code now removed after refactoring.