No idea if these changes even work