removed dubs and added new ones