Back to the old way, found cause of dupe problem.