Lots of changes trying to get the raise stuff to work