changes for stuff to work