renamed/removed duplicates