Added some stuff to autojoin