fixed everything no more doubles