Changing some things to force it to work.