Changed up more stuff to work