Even more changes yay