Added some auto stuff.