removed some possible duplicaes