Changed waaaay too much stuff to note