changed stuff to work again