fix all the stuff to make it work