Added some things that should be set!